From d9bfa563d0c38101adc05c453b2663b7ed453ec7 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 18 Jul 2011 18:07:43 +0200 Subject: [PATCH] tearoffmenuitem: Use gtk_widget_class_set_accessible_role() --- gtk/a11y/gtkmenuitemaccessible.c | 5 +---- gtk/gtktearoffmenuitem.c | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gtk/a11y/gtkmenuitemaccessible.c b/gtk/a11y/gtkmenuitemaccessible.c index ddea3528dc..c2cd0d4587 100644 --- a/gtk/a11y/gtkmenuitemaccessible.c +++ b/gtk/a11y/gtkmenuitemaccessible.c @@ -65,10 +65,7 @@ gtk_menu_item_accessible_initialize (AtkObject *obj, GTK_WIDGET_ACCESSIBLE (obj)->layer = ATK_LAYER_POPUP; - if (GTK_IS_TEAROFF_MENU_ITEM (data)) - obj->role = ATK_ROLE_TEAR_OFF_MENU_ITEM; - else - obj->role = ATK_ROLE_MENU_ITEM; + obj->role = ATK_ROLE_MENU_ITEM; } static gint diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c index bf3a37c766..81c9ec73b3 100644 --- a/gtk/gtktearoffmenuitem.c +++ b/gtk/gtktearoffmenuitem.c @@ -103,6 +103,8 @@ gtk_tearoff_menu_item_class_init (GtkTearoffMenuItemClass *klass) widget_class->get_preferred_height = gtk_tearoff_menu_item_get_preferred_height; widget_class->parent_set = gtk_tearoff_menu_item_parent_set; + gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_TEAR_OFF_MENU_ITEM); + menu_item_class->activate = gtk_tearoff_menu_item_activate; g_type_class_add_private (klass, sizeof (GtkTearoffMenuItemPrivate)); -- 2.30.2